Completed previous commit with additional files