updated based on @dried words