Added prevoiusly forgotten changes