added features done to develoment's branch