Beofre sending to github
Merged changes