Fixed all logic updates