Removed wierdness!