reformated
added more live properties