fixed bug, uncommented everything