Added extra mechanics