get back properly funtionality