added mapo and changed behaviour of evaluate at getset