Removed temps, worked on a5