added features and buga