Working on speeding up the interface further