Additions and some rearranging