moved some parts to make layout for power cleaner