a few tweaks
hmm... not working :(