1.7: more improvements xd