Fixed and improved all