Cleaner implementation of previous commit