Stable version with wrappers, still controller extension