REmoved old incontrol stuff, re did incontrol setup