updating nick's branch