drew fixed login
merging