Added more inital coding