Updated - Still troubleshooting