Added controller patch