more optimization and got rid of the ~ cause it looked stupid