3rd commit by Caxy
added new changings