Changes made in order to work with my project