fixed merge conflicts from Yonet's pull request :)