Consistency with names and all
Broken commit but adding in onLoad method