Change constructor to onLoad