New version with tight positions but I need to clean up the mess