updated.. working