Did some corrections after testing