Implemented comments after review with Professor Lai