Changes based on Charlie's review