Updated up, added more features