pulled edik's update