Second update to get it working