Star's version & Adler Fixes