Added functional controls