This is not hard for me, but I think this should be done in another pull request :)