Made several changes