Add mask showing, remove array sorting