Still fixing some details