Cleaned v1.1.1