fixed bug and mada small change for myself