some updates
working