Added several changes