Ok this should clean it all up