upgraded citrus engine and added controls
merge