some buggy stuff removed.