made some updates based on bobby comments