Moved some interface around