type added in form
merged master and marker branch