Usable ENV & Bug fix