Implement some of fishcakez feedback