Changed to pure GameObject design