Adapted to fixes, added translate matrices