Made some changes to update to 5.2 and slightly fix spacing