updated to reflect the new interfaces design