Updated to the proper syntax/rewritten