Updated with smoke function and house base