added features - still some missing