removed stupid coding