add implementation of previous commit