Completely working remake of old version!