Added some features Xp