Added properl on load handler