Small changes
Merged codes
Fixed conflict from merge