updated to be more angular