Pulled some changes