Updating code to 0.3