Added and moved some things