Merging Versaiteis' changes