Some updates from my last used code