fixed bugs, simplified