WIP improving module 4