now functionality fix attempt