Cleaned up code, also a fallback