* moved code around
 moved the rest around