added naming conventions ect