Edited some changes from Sams vid