Completed

adding more features (for dakunil only)