added most features