Status

a couple of changes and trying my best