Removed inxed controller - for real this time...