Removed inheritance, added standard trial code