updated with more awesome features