A few changes, not working! Will be fixed later