Still fixing quite propmt