made changes base on review from sheroy