Added some chages and created method - firstLoad