started number 5 2013
fixing conflict:
rearranged methods