Updated to version 2.04