Updates
Features and going further