Updated and hopefully fixed