version 1.0 by developer 1 with out conflict