fixed bugs, removed falt validation function for a while