inital commit
optimize