Remodeling

Signed-off-by: Patrick Meppe <tapmeppe@gmail.com>