V1.1.1 Cleaned code