Adding some changes Ray wanted