Added complete functionality v.3.0