IMPROVED : Version 0.1