finally working again. Now Let's cleanup this mess