moved code around, nothing serious