Added more changes and features