fix that all up