Fixing bugs
Adding version to optimize