Messing around with system, some tweeks