final commit - tomas