[NOT WORKING] fixed some issues