fixed andrews issues!