added table and form function