Self contained approach now working