Fixed name and easier implementation for Simon