cleaned up, somehow ready for future