Partial implementation of suggestions