some updates to get it workign within the editor