Did more work on advanced version