Adding upfront functionality