Incorporate ricky's changes