20 points commit - will patch message later