Revert fbe4738..9149b2c

This rolls back to commit fbe47380d286751a22e3ee6bf2baca00faf5d7f8.
Revert "Revert fbe4738..9149b2c"

This reverts commit fa90e3016291d29d5073bf4351382cd74ca6908b.
module 6