Updated few underlying mechanics