merging steven's changes