Added all the changes pushed to gitlab today