some missing features added