Adding some brand new features