added 5.4 and added todos