removed ; : mapping, added easier buffer switching mapping