Update after review from peehaa and jack