Implemented this and the last one in the latest commit :)