update based on requirements from mama soko