back to simplicity and consistency