Has to be addressed (24/48)

Has to be addressed