Changed to larval framework