fixied some stupid code