Fixing stuff I fixed before but somehow got reverted