updated to suit myself