Changed to new arcitecture