refixing the things i fixed before