SugariuClaudiu: Updates added back to main repo. True author of this commit