Minor changes will messing around