Edited code and resolved data
Unstable version