added manually a few lines that didnt change when i merged dev into this branch