Changed coding convensions