With Frank suggestions

Syncing it up