recaculated with 0.0.7
changed names and logic