More updates, no error in console till now