changed layout of functional- still in debate whether it should remain