yet another commit - applying neccessar changes