working as it should for now